Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "0" TFT Touch Calibration Settings #25579

Merged
merged 5 commits into from
May 3, 2023
Merged

Revert "0" TFT Touch Calibration Settings #25579

merged 5 commits into from
May 3, 2023

Conversation

thisiskeithb
Copy link
Member

@thisiskeithb thisiskeithb commented Mar 26, 2023 •
edited
Loading

Description

Revert "0" TFT touch calibration settings since they prevent default values in pins files from being used.

Requirements

Native/directly connected TFT-based config

Benefits

Allows values from pins files to work again.

Related Issues

@thisiskeithb
Copy link
Member Author

thisiskeithb commented Mar 26, 2023 •
edited
Loading

Hmm. That didn't work despite testing my configs here.

Is it possible to include pins files before tft_orientation.h so the various touch orientation/calibration/offset values aren't set to 0 by default?

@thinkyhead
Copy link
Member

thinkyhead commented Mar 26, 2023 •
edited
Loading

Is it possible to include pins files before tft_orientation.h so they aren't set to 0 by default?

Standard procedure is to include MarlinConfigPre.h (at least) in any header that has dependencies on configs (i.e., headers with #if referring to configurable settings). That step was forgotten with this header file.

@thisiskeithb
Copy link
Member Author

thisiskeithb commented Mar 26, 2023 •
edited
Loading

Standard procedure is to include MarlinConfigPre.h (at least) in any header that has dependencies on configs

Marlin's include tree is difficult for me to follow, but does that also bring in the pins files before this one (tft_orientation.h)?

Touch calibration & orientation values from motherboard pins files are being ignored since values are set/zeroed out in tft_orientation.h.

@thinkyhead thinkyhead force-pushed the pr/revert_zero_touch_calibration_values branch 5 times, most recently from b57b34f to 6d71443 Compare April 8, 2023 01:41
@thisiskeithb thisiskeithb marked this pull request as draft April 10, 2023 00:38
@thinkyhead thinkyhead force-pushed the bugfix-2.1.x branch 3 times, most recently from de391db to 0f34163 Compare April 12, 2023 05:14
@thisiskeithb thisiskeithb force-pushed the pr/revert_zero_touch_calibration_values branch from 6d71443 to 121d8e8 Compare April 17, 2023 12:48
@thisiskeithb thisiskeithb force-pushed the pr/revert_zero_touch_calibration_values branch 2 times, most recently from 734ca77 to 5b11748 Compare April 29, 2023 01:23
@thisiskeithb thisiskeithb force-pushed the pr/revert_zero_touch_calibration_values branch from 5b11748 to a4fb128 Compare May 3, 2023 20:34
@thisiskeithb thisiskeithb mentioned this pull request May 3, 2023
Closed
@thisiskeithb thisiskeithb marked this pull request as ready for review May 3, 2023 21:02
@thinkyhead thinkyhead force-pushed the pr/revert_zero_touch_calibration_values branch from fc4b59e to cc8845d Compare May 3, 2023 21:12
@thinkyhead thinkyhead merged commit 7642bfb into MarlinFirmware:bugfix-2.1.x May 3, 2023
@thisiskeithb thisiskeithb deleted the pr/revert_zero_touch_calibration_values branch May 3, 2023 21:24
danielcastilho pushed a commit to danielcastilho/Marlin_KP3S_Custom that referenced this pull request May 4, 2023
Squashed commit of the following:
1e46057 
commit cfbd8a2
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu May 4 00:20:30 2023 +0000

    [cron] Bump distribution date (2023-05-04)

commit 7642bfb
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Wed May 3 14:19:32 2023 -0700

    🐛 Fix TFT Touch Calibration overrides (MarlinFirmware#25579)

    …and other misc. display-related updates

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit dbed3f1
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed May 3 00:20:18 2023 +0000

    [cron] Bump distribution date (2023-05-03)

commit e1f6435
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 2 17:59:27 2023 -0500

    ✨ Creality STM32F401RE board (e.g., Ender-5 S1) (MarlinFirmware#25773)

commit 21ea9bf
Author: plampix <plampix@users.noreply.github.com>
Date:   Tue May 2 23:50:07 2023 +0200

    🐛 Fix minimal M115, Cap:PROGRESS:0 (MarlinFirmware#25769)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 137ea43
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed May 3 09:15:10 2023 +1200

    ✨ Creality Ender-2 (Melzi) (MarlinFirmware#25754)

commit 9aa69cb
Author: plampix <plampix@users.noreply.github.com>
Date:   Tue May 2 07:01:44 2023 +0200

    Fix G12 Nozzle Clean (MarlinFirmware#25766)

    Followup to MarlinFirmware#25666

commit 61f0dd2
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 1 20:23:41 2023 -0500

    🩹 Fix _CAN_HOME for new endstop flags

commit 207535a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 1 20:33:58 2023 -0500

    🔨 Fix Multi-Language Menu criteria

commit 4812ed5
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 1 18:45:42 2023 -0500

    🎨 Misc. code cleanup

commit f89fa4c
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue May 2 00:24:02 2023 +0000

    [cron] Bump distribution date (2023-05-02)

commit b042567
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 1 18:15:31 2023 -0500

    🩹 Fix TFT sanity error

commit 4bed8a8
Author: Scott Mikutsky <smikutsky@gmail.com>
Date:   Mon May 1 02:10:46 2023 -0400

    🐛 Fix STM32 USB disconnect behavior (MarlinFirmware#25762)

commit 006a9e5
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 23:10:44 2023 -0500

    🩹 NOZZLE_CLEAN_PATTERN_* Followup

    Followup to MarlinFirmware#25666

commit 55cbe15
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 19:14:53 2023 -0500

    🔧 Remove config.ini obsolete options

commit 35dd6a3
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon May 1 00:22:20 2023 +0000

    [cron] Bump distribution date (2023-05-01)

commit 9773160
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 18:24:05 2023 -0500

    🔧 Character display has boot screen

commit f246e0d
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 18:12:13 2023 -0500

    🔧 Fix X2/Y2 axis pins check

commit 4937a64
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 18:12:21 2023 -0500

    🧑‍💻 Use NUM_AXIS_ARRAY

commit b88ab39
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon May 1 09:52:29 2023 +1200

    🐛 Fix Ender-2 Stock LCD on MELZI_CREALITY (MarlinFirmware#25759)

commit 3b50b6a
Author: Davide Rombolà <davide.rombola@gmail.com>
Date:   Sun Apr 30 23:36:47 2023 +0200

    🔧 Allow BLTOUCH_HS_EXTRA_CLEARANCE == 0 (MarlinFirmware#25760)

commit ec6bc15
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Apr 29 20:10:33 2023 -0500

    🐛 Fix FT Motion reversed Z

commit 5aef2c0
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 00:22:44 2023 +0000

    [cron] Bump distribution date (2023-04-30)

commit 4c033c3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Apr 29 12:34:56 2023 -0500

    🧑‍💻 Tweak homing debug

commit f9db5ab
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Apr 29 00:20:26 2023 +0000

    [cron] Bump distribution date (2023-04-29)

commit c5a2e41
Author: James Pearson <jamespearson04@hotmail.co.uk>
Date:   Fri Apr 28 23:30:15 2023 +0100

    🐛 Probe behavior corrections (MarlinFirmware#25631)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Co-authored-by: David Fries <2767875+dfries@users.noreply.github.com>

commit 7d95928
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 28 13:38:59 2023 -0500

    🐛 Fix auto pullup/down settings

    Followup to MarlinFirmware#25748

commit a872232
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 28 11:03:38 2023 -0500

    🔧 Move MMU section

commit 6323de3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 28 11:03:20 2023 -0500

    🔨 Fix LPC faux pins

    Followup to MarlinFirmware#25332

commit 0e2c5b4
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 28 00:21:29 2023 +0000

    [cron] Bump distribution date (2023-04-28)

commit 959f730
Author: TheSnowfield <17957399+TheSnowfield@users.noreply.github.com>
Date:   Thu Apr 27 20:37:11 2023 +0800

    ✨ AUTO_REPORT_REAL_POSITION option for M154 (MarlinFirmware#25738)

commit 9a7d9e6
Author: Martin Turski <turningtides@outlook.de>
Date:   Thu Apr 27 14:05:24 2023 +0200

    🧑‍💻 Optimize PlatformIO source filtering (MarlinFirmware#25332)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 774861b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 20:04:01 2023 -0500

    🔧 Endstops followup

commit 04a25ab
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Apr 27 00:22:32 2023 +0000

    [cron] Bump distribution date (2023-04-27)

commit 467ab74
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 14:56:23 2023 -0500

    🧑‍💻 Simplify endstops config (MarlinFirmware#25748)

commit 358a54e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 14:39:56 2023 -0500

    🔨 Servo Timer 1 with STM32F103RC_fysetc (MarlinFirmware#25741)

commit 79b4555
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Wed Apr 26 21:38:39 2023 +0200

    🔧 Thermistor 100 : SoC sensor (MarlinFirmware#25745)

    Followup to MarlinFirmware#25642

commit d364bab
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 14:29:21 2023 -0500

    🧑‍💻 Change HAL_PATH macro for easier HAL relocation (MarlinFirmware#25743)

commit 1771d7a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 13:51:33 2023 -0500

    ✅ Skip change alerts in CI test

commit 68f7478
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 13:50:45 2023 -0500

    🎨 Misc. fixes, cleanup

commit 08edb62
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 02:57:53 2023 -0500

    🔧 Extra axis endstop defaults

commit a4cc9b6
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 00:21:12 2023 +0000

    [cron] Bump distribution date (2023-04-26)

commit f5a905a
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Tue Apr 25 04:51:44 2023 +0200

    ✨ TEMP_SENSOR_SOC (MarlinFirmware#25642)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit d1738e9
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Apr 24 21:40:08 2023 -0500

    🔧 Fix LCD_SERIAL_PORT config

commit 650e6fc
Author: Anson Liu <ansonl@users.noreply.github.com>
Date:   Mon Apr 24 22:07:12 2023 -0400

    🔨 Prevent SlowSoftWire + Wire name conflict (MarlinFirmware#25707)

commit c034819
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Apr 25 00:20:57 2023 +0000

    [cron] Bump distribution date (2023-04-25)

commit 077a620
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Apr 24 05:24:10 2023 -0500

    📝 Developer note in boards.h

commit 2954bf2
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Apr 24 00:24:40 2023 -0500

    🌐 Replace '=' with '{' for substitution

commit 743903b
Author: Nick <nick@n-wells.co.uk>
Date:   Mon Apr 24 01:50:39 2023 +0100

    🩹 Fix Anycubic PlayTune (MarlinFirmware#25735)

    Followup to MarlinFirmware#25690

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 02a14d3
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Apr 24 00:21:28 2023 +0000

    [cron] Bump distribution date (2023-04-24)

commit df4f806
Author: plampix <plampix@users.noreply.github.com>
Date:   Mon Apr 24 01:12:47 2023 +0200

    ✨ NOZZLE_CLEAN_PATTERN_* (MarlinFirmware#25666)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 9902097
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon Apr 24 11:11:02 2023 +1200

    🔨 Gather GD32, suppress redundant #error (MarlinFirmware#25665)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 10ed5ab
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 03:17:55 2023 -0500

    🚸 Improve PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED (MarlinFirmware#25681)

commit 1669356
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 03:00:56 2023 -0500

    🔧 Split followup

commit aaf55a2
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 02:07:42 2023 -0500

    🩹 Fix UBL safe measure move with extra axes

    Followup to 7e79fc5

commit 69f8da4
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 01:58:01 2023 -0500

    🔧 Split Changes.h from SanityCheck.h (MarlinFirmware#25732)

commit f0f7ec8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 00:47:44 2023 -0500

    🧑‍💻 Stepper::set_directions() => apply_directions()

commit 921591d
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Apr 22 23:15:31 2023 -0500

    🧑‍💻 SDIO_SUPPORT => ONBOARD_SDIO

commit 5664c02
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Apr 22 22:43:09 2023 -0500

    🧑‍💻 Generalize SDSUPPORT as HAS_MEDIA

    In preparation for single- and multi-volume refactoring.

commit ce85b98
Author: Jason Smith <jason.inet@gmail.com>
Date:   Sat Apr 22 20:27:01 2023 -0700

    🩹 Relocate Fan conditionals, sanity-checks (MarlinFirmware#25731)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 95cfc98
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 00:22:56 2023 +0000

    [cron] Bump distribution date (2023-04-23)

commit 5d8d38a
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Apr 23 08:59:51 2023 +1200

    🩹 Status / Host Prompt followup (MarlinFirmware#25720)

    Followup to MarlinFirmware#25679

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 3117339
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Apr 22 12:06:22 2023 +0000

    [cron] Bump distribution date (2023-04-22)

commit c8ed795
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Apr 22 21:09:17 2023 +1200

    🔧 Permit extrude without hotend (MarlinFirmware#25709)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 89ccede
Author: Alexey D. Filimonov <alexey@filimonic.net>
Date:   Sat Apr 22 12:06:19 2023 +0300

    🎨 Clean up TFT Color UI display items (MarlinFirmware#25712)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit fba1f83
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Apr 22 21:02:51 2023 +1200

    🩹 Fix Anycubic PlayTune (MarlinFirmware#25728)

    Followup to MarlinFirmware#25690

commit 726de7e
Author: Nomis-97 <72187111+Nomis-97@users.noreply.github.com>
Date:   Sat Apr 22 10:16:19 2023 +0200

    🐛 Fix MKS Gen-L MOSFETs (MarlinFirmware#25717)

commit 4233e48
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Apr 22 01:56:10 2023 -0500

    🚸 MarlinUI Endstop Test Screen, and more (MarlinFirmware#25667)

commit 98277f2
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 21 00:20:12 2023 +0000

    [cron] Bump distribution date (2023-04-21)

commit ded9ffa
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Apr 20 17:35:20 2023 -0500

    🧑‍💻 Apply INVERT_DIR to SET_STEP_DIR

commit 335ba32
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Apr 20 17:21:59 2023 -0500

    🩹 Fix Core Kinematics BABYSTEP_XY
EvilGremlin pushed a commit to EvilGremlin/Marlin that referenced this pull request May 8, 2023
@thisiskeithb @thinkyhead @EvilGremlin
🐛 Fix TFT Touch Calibration overrides (MarlinFirmware#25579)
d66e6b7 
…and other misc. display-related updates

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
EvilGremlin pushed a commit to EvilGremlin/Marlin that referenced this pull request May 17, 2023
@thisiskeithb @thinkyhead @EvilGremlin
🐛 Fix TFT Touch Calibration overrides (MarlinFirmware#25579)
b221f1b 
…and other misc. display-related updates

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
tspiva pushed a commit to tspiva/Marlin that referenced this pull request May 25, 2023
@thisiskeithb @thinkyhead
🐛 Fix TFT Touch Calibration overrides (MarlinFirmware#25579)
7528275 
…and other misc. display-related updates

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Andy-Big pushed a commit to Andy-Big/Marlin_FB_Reborn that referenced this pull request Jul 15, 2023
@thisiskeithb @thinkyhead @Andy-Big
🐛 Fix TFT Touch Calibration overrides (MarlinFirmware#25579)
b4ad2db 
…and other misc. display-related updates

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C: LCD & Controllers F: Calibration PR: Bug Fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thisiskeithb @thinkyhead